]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
networkAgent: Remove height-for-width hack
authorFlorian Müllner <fmuellner@gnome.org>
Thu, 11 Jul 2013 14:21:53 +0000 (16:21 +0200)
committerFlorian Müllner <fmuellner@gnome.org>
Tue, 20 Aug 2013 06:18:33 +0000 (08:18 +0200)
ClutterBoxLayout has proper height-for-width support, so make use
of it.

https://bugzilla.gnome.org/show_bug.cgi?id=704015

js/ui/components/networkAgent.js

index 13f9e31950a1c39a09fbd6836ac753f6a7aa2795..c83782f84eee3d84e2cb277e44a55369954137d8 100644 (file)
@@ -62,14 +62,9 @@ const NetworkSecretDialog = new Lang.Class({
 
         if (this._content.message != null) {
             let descriptionLabel = new St.Label({ style_class: 'prompt-dialog-description',
-                                                  text: this._content.message,
-                                                  // HACK: for reasons unknown to me, the label
-                                                  // is not asked the correct height for width,
-                                                  // and thus is underallocated
-                                                  // place a fixed height to avoid overflowing
-                                                  style: 'height: 3em'
-                                                });
+                                                  text: this._content.message });
             descriptionLabel.clutter_text.line_wrap = true;
+            descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
 
             messageBox.add(descriptionLabel,
                            { y_fill:  true,